\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83<span class=?p=kmailtransport.git;a=rss" type="application/rss+xml" />
\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83<span class=?p=kmailtransport.git;a=rss;opt=--no-merges" type="application/rss+xml" />
\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83<span class=?p=kmailtransport.git;a=atom" type="application/atom+xml" />
\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83<span class=?p=kmailtransport.git;a=atom;opt=--no-merges" type="application/atom+xml" />
Merge version 20.04.1-1+rpi1 and 20.04.1-2 to produce 20.04.1-2+rpi1